From be4027834a591193aae3f71e1190603cf2109f87 Mon Sep 17 00:00:00 2001 From: robertl Date: Fri, 20 Jun 2008 14:41:43 +0000 Subject: [PATCH] Add (LAT|LON)_DDMMDIR to write site. Tweak doc. Let cup use this. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@3267 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/csv_util.c | 8 ++++++++ gpsbabel/internal_styles.c | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c index 680946b3b..1ea09aba6 100644 --- a/gpsbabel/csv_util.c +++ b/gpsbabel/csv_util.c @@ -1548,6 +1548,10 @@ xcsv_waypt_pr(const waypoint *wpt) writebuff(buff, fmp->printfc, dec_to_intdeg(lat)); break; + case XT_LAT_DDMMDIR: + /*latitude as (degrees * 100) + decimal minutes, with N/S after it */ + dec_to_human( buff, fmp->printfc, "SN", degrees2ddmm(lat) ); + break; case XT_LAT_HUMAN_READABLE: dec_to_human( buff, fmp->printfc, "SN", lat ); break; @@ -1577,6 +1581,10 @@ xcsv_waypt_pr(const waypoint *wpt) writebuff(buff, fmp->printfc, dec_to_intdeg(lon)); break; + case XT_LON_DDMMDIR: + /* longidute as (degrees * 100) + decimal minutes, with W/E after it*/ + dec_to_human( buff, fmp->printfc, "WE", degrees2ddmm(lon) ); + break; case XT_LON_HUMAN_READABLE: dec_to_human( buff, fmp->printfc, "WE", lon ); break; diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c index c48607a33..b21cab142 100644 --- a/gpsbabel/internal_styles.c +++ b/gpsbabel/internal_styles.c @@ -113,10 +113,8 @@ static char cup[] = "OFIELD SHORTNAME,\"\", \"\"%s\"\"\n" "OFIELD SHORTNAME,\"\", \"%s\"\n" "OFIELD CONSTANT,\"\", \"\"\n" -"OFIELD LAT_NMEA, \"%f\", \"%08.3f\", \"absolute\"\n" -"OFIELD LAT_DIR, \"\", \"%c\", \"no_delim_before\"\n" -"OFIELD LON_NMEA, \"%f\", \"%09.3f\", \"absolute\"\n" -"OFIELD LON_DIR, \"\", \"%c\", \"no_delim_before\"\n" +"OFIELD LAT_DDMMDIR, \"\", \"%08.3f%c\"\n" +"OFIELD LON_DDMMDIR, \"\", \"%09.3f%c\"\n" "OFIELD ALT_METERS,\"\", \"%3.1fm\"\n" "OFIELD CONSTANT,\"\", \"1\"\n" "OFIELD CONSTANT,\"\", \"\"\n" -- 2.30.2